Some cleanup in settings patching