Moving a partial fix to linux, for better debugging.
also, rectified a few names.
Authored by: tswift 2014-08-10
Parent: [r8023]
Child: [r8025]