Fixed strict errors