Decomposition Fixes
Merge pull request #349 from sandal-smuggler/decomposition-type-fixes

Decomposition Fixes