Added more warnings