Changes made to fix deployment issues