Fixed some errors #2