#3 Fix notices and warnings in strict mode