changes to work with z builds