Fix set initialization issues
4 files changed