Minor changes; Preparations for the Config overhaul