Scaler: Update for Oct 4

Some bug fixes.