Fixes for DEV and STweaks + Synapse.