[RJA-2331][fix] - Minor bug cleanup

...t