Decomposition Item Fixes
Merge pull request #348 from sandal-smuggler/Decomposition-Item-Fixes

Decomposition Item Fixes