Fix some invoice parsing errors