Fixes 8-bit code in issue #2821
Fix other NULL statements
Merge pull request #2837 from makotech222/cwcheatfix

Fixes 8-bit code in issue #2821