Various fixes for the NC