Fixes for NFS-e SP