Fix integration issues while updating keys