Firmware and metadata fixes