Fix more problems caused by padding in the Capability structure