Fixing psicc several bugs