Added some extra warnings