Stupidity fixes