Release engineering fixes