Small fixes for NL messages
Merge pull request #359 from francisdb/patch-1

Small fixes for NL messages