Tweaks to preconditions