[ref_impl_eiffel] [1530] Fixes:

Revision: 1530
Author: thomas.beale
Log Message: