Fixed some errors (hopefully).