My fixes