Added a few extra warnings