Additional command return trimming to work on Windows