Partially fixed more of the code so the Jw mapping system test can go further before failure.
Authored by: semor 2008-04-04
Parent: [r5310]
Child: [r5312]
