Cypsis: Fix some issue's 10-7