Fixed up some problems with my last check-in