Minor replacement changes
* Modified the replacements to work with our code