A bit more minor improvements