Few code rot tweaks