Minor changes + update to YCM