Fixed some issues in capabilities.h