Fix a few bugs
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development