Some tweaks to improve behaviour at special cases