Fix minor deployment issues