[ref_impl_eiffel] [992] Various fixes:

Revision: 992
Author: thomas.beale
Log Message: