Added some missing cases for Release