Fixed some errors..