CarbonFibers - Fix some derps

Change-Id: I2a1d50bfd8ff2e80a993ccfdee50b96576b8d532
Signed-off-by: MURA Stefano [STELIX PippoX3] <ssspinni@gmail.com>
Merge "CarbonFibers - Fix some derps" into kk