Few bug fixes to ngap