Various changes (quick commit before OS reinstall).