More ConfigParser compatibility fixes :-(