Fixed 2 bugs

https://github.com/Murkantilism/Enigmatic/issues/28
https://github.com/Murkantilism/Enigmatic/issues/27