Made changes to correct errors by Theme Check