--Bugfixes to preprocessor directives