Non essential fixes
This should fix next travis error