Misc bug fixes

Should be moving the 1.7.10 version out of beta soon!