Even more fixes due to copy-paste errors