Local references updated.
Some fixes.