Some minor improvements'