Update recordings, fix a few NH issues