fixes due to ngs changes