Caner small fixes