Fixed some issues
Fixed some issues