strictmode fixes