Fixed strict issues