Minor fixes for using config file