Fixes for bad copy/pasting of code