Try more six fixes.