More sane return types