Small fixes

Yeah I think so. Chris actually originally did it like that.