APOLLO-3342 Fixed some minor issues