Added extra error and warning flags