more fixes for non windows