fixup system tweaks