Linux fixes

Breaking osx now :/. Should make the effort to get both working.