Import fixes

Fixes for issues discovered during VCF import testing.