Fixes for playtest