Fixed some errors?