Add some more warnings (DO NOT MERGE)