Cleaning up some imports and a typo in a template