Minor changes from wm-2