Remove 'logical' cheat that did nothing.
Fix compile warnings