Fix checking of capability name
Tweak build instruction