Some issues are fixed