Some more linux related stuff to fix.