Fixed up some errors in previous commit