- Small improvement to handling of sample config