Fixes from integration testing with Scaler.