Configuration fixes :)