More big fixes due to import coding