YCM improvements