Updated the following files to fix issues reported on the admin side.