Fixed some PATCH issues.