Fixing strict errors