couple more changes to pass all specs