Corrected support for single and multi-processor modes.-