fixes and replacements