First fixed issues