Fixed some issues
Fixed issues