Fix some issues regarding arbitrary variable mapping