CLC-4488 - Minor fixes

https://jira.ets.berkeley.edu/jira/browse/CLC-4488

See comments by @christianv in #3137