Testing and misc. fixes.

Tested new version upgrade and fixed MSM compatibility issue with new
module settings.