small boilerplate fixes