Some of the issues fixed