Added extra warnings