Bugfixes - mostly related to capabilities