Minor fixes for NRL project