WOBS-3430 & bugs fixes reported by Michael