Fix bugs in Comp/Decomp Layers