fix up various crap