Fix STATIC and some other things