Fixes a crash when there's no Saga data and message selection is changed
Fixes #237
Fixes #242
Fixing some code inspection warnings
Reverting back changes to build support files