Adjustments to pass GNAT 4.9 compilatiion without warning