CORE-5030 minor bug fixes