Fixes by cep