Fixes related to "Features" synchronization.