Minor bugfixes and cleanups
Merge branch 'master' of https://github.com/SyburNet/Sybur