Fixed some errors in previous commit