Minor fixes to prepare RM for release