Some feature spec fixes