Some issues are resolved

Some issues are resolved