Mark some places to modify for RPMD