m8: misc derp fixes from dorimanx