More bug fixes!
MOAR bug fixes!