Spec adjustments according to BZ1020839#c22