My fixes

My fixes