Seems I did a bad copy-paste job, fix more errors