Fixes and replacements