Minor fixes and adding a slide on strict mode