Small Deployment Fixes