Tiny mods to get a few things working right