National, Clone: Various fixes.