More stupidity fixes