Various fixes before extensive modification of snv.py