Fixes for RMG comments