More tweaks to work across systems