[fix] - mix small fixes