Fixes for build/deploy.