WOBS-3117

Fixes for WOBS-3117 and WOBS-3117. Both seemed useful for the core