Tweak boilerplate