Fix production issues
Enforce strict mode