MSS: Merge with latest default config
Small fixes