Moar bug fixing