Various fixes.
Various fixes.