System-wide capabilities fixes