Fix overwrite accident and comment out other unit types