Release fixes from nadim