Starting rebuild.
More build work.
Small fixes.