couple of boilerplate fixes