Whoops, stupid typo and copy-paste errors