Fixes to NFe Writer