Some org and package updates for WET4