Config cleanup/fixes