Release fixes