Accidentally merge changes into the main tree.  Reverted.  Also fixed a few recent compile problems.
Accidentally merge changes into the main tree.  Reverted.  Also fixed a few recent compile problems.