Configuration and other changes