Fixes for correct set type