changes to fix deployment issues