CarbonFibers - Some fixes

Change-Id: I71b8d528b9e5d624e7ecd45a8529a4894bf939f8
Signed-off-by: STELIX <ssspinni@gmail.com>