Add latest modifications to minmode too.

Commits:
e79ab3ab99395900c9ca6ce97b58a132113d01a5
f5273a49b03b672a0500e94c7b65907701fe1af8
291ffe0d3bdfa8f4b29ecdc575f40f48fb03e843
473d29f1d53ef18e0061b438104af97598d6e745
6cba3c1246e23be36c2c66950efac8eda46785fc