Fixing upgrade messages