Adapt to 2.3.14

Signed-off-by: Andrew John Hughes <gnu_andrew@member.fsf.org>