Fixed some fatal errors.