Configuration fixes