Fix and add unset methods