Fixes for copy/paste errors