NL: A couple of fixes