Clean up some warnings including explicit pre-processor ones