fix some minor issues from acceptance tests