MISC
Fixed issues