Some stupidity fixes