Removed warnings
Fixed warning and cursor
Removed warnings