RE: Some fixes in capabilities