Fixes for unix