Added missing definitions as required by 9.4.2-3