Changes to setup to work in x32