Added some extra warning flags