fixes and adding to dspace build process