[PR] Additional fixes now that we're in production