Fixed up some stuff.