Decomposition Fixes