Portability improvements
Ignore basic stuff