Fixes to fit with nwolb design (Oct 2014)