Fix some release issues