Fixes learned from a bad deploy