Small changes to get specs to pass