Minor fixes

Tried if works in my pc