Support for empty witnesses - minor tweaks