Fixed up a few bits