Made compilation on Linux possible again, better standards conformance