Fixed up some small stuff