Again, some fixes mainly flaws in compiler directives