Fix boilerplate