Fixing Tramzkiller merge fuckups