Make return functionality more sane