Some more fixes to CKJV importing.