Fixes for the failed PRs

https://github.com/minecraftforum/rules/pull/86
https://github.com/minecraftforum/rules/pull/85
https://github.com/minecraftforum/rules/pull/83
https://github.com/minecraftforum/rules/pull/82
https://github.com/minecraftforum/rules/pull/81
https://github.com/minecraftforum/rules/pull/80
https://github.com/minecraftforum/rules/pull/79
https://github.com/minecraftforum/rules/pull/78