Small interface improvements