Boilerplate corrections