fix system messages