Hacky fixes for game perf