Fixes spec failures on master