Overtime System Fixes