[ref_impl_eiffel] [1381] Various fixes:

Revision: 1381
Author: thomas.beale
Log Message: