More configuration-work - sigh...