Moar bug fixes

meh