Some minor improvements...