1.9.3 fixes
-Hope I didn't miss any fixes that shouldn't have gone through...