Minor changes to boilerplate