More Overtime System Fixes