More big fixes