Fixing specs based on the last few commits, sorry.: