Some fixes.
Some fixes.