project boilerplate fixes