More tweaks to expectations