Fixed some NL bugs