tweaks to handle path separator issues