Small improvements in the interface