Perform some basic cleanups of things missed during CMRs - pretty minor stuff, but worth keeping up on