Update nh-setup with last changes