More work on references fixes.
Bump engine version.