Some more checks (this is getting pretty stupid now)