Updated nocm build