Fixes for empty sets