Cypsis: Fix some issue's 5-7