Starting to merge recent fixes from NB+