Fixed up a few things