reverted shader change breaking windows host, some vs fixes