Small fixes so that VA will be mapped as va.