Fix for some build errors on Linux