Fixing more specs (side effects from previous fixes)