Fixed boilerplate issues.