Additional warnings added