Final configuration fixes...