Use strict code, fix issues discovered in the process