Real (partial) fix for deployment issues