Some bugs fixed

1 job for master