Replace more ROM references