Fixed strict warnings