Fix messages to have proper number of arguments to format string