Fixed some auto detected errors