Added few extra warnings