Fixed error and warning messages