* Some issues fixed