Fix a few nits from strict that cause errors on load