merge some playtest fixes to Steam build