Edits due to SASSIE integration (mostly cosmetic)