boilerplate fixes