Fixed up some bugs from last update