minor utility and config changes