Additional corrections to preprocessor directives. Requires changes from...

... Chris to properly function