Merge pull request #1111 from GlowstoneMC/perf-fixes

Performance fixes