configuration change fixes