Fix some resources and data issues.