Some issues solved