Fixed some errors
Fixed some errors