Fixes related to deployment