UCJEPS-512: capturing several small corrections that escaped earlier checkins. And a tiny bit of cleanup