Some issues fixed