Added patchset to fix copy and paste errors and ugly coding style in recently committed ws32 patch.