Configuration fixes.