More minor improvements (voyant)