Fixes	various preprocessor mistakes