Boilerplate fixes