Untested work.
Fix Elgius update bugs.