Added errors and warnings