yet more string parsing fixes