Fixed up last few things