Fixed up some issues