fixes to work from vs