Minor fixes

Playability fixes.