Minor changes removing OSX specific things