Changes to get running on vecnet-qa