Basic and standard boilerplate fixes
2.1.1