Tweaks and checks