More fixes
No noeed for the config file anyore, now we add the defines manually