More bug fixes in the SVF module