A handful of tweaks

Granted, one of them does change the API.