Some minor improvements