Fix up some crap