small api improvements