Fixed some errors #1