Some fixes and removed YCM