Some more fixes for the 'mode' class variable.
These problems were due to the multi-processor code merger.
Authored by: bugman 2011-08-25
Parent: [r14446]
Child: [r14448]