fix some more things

Yeah.