2.0.5: Configuration sync tweaks