Correcting 1.2 issues fixed