Small fixes for NL messages