Fixed various dependency problems introduced by previous config file cleanup