Couple fixes from Dirk's comments