Fixes for unixes