Fixes for playability