Modified some vam things to work onmac