Fixes for deployment and sanity