Initial set of fixes.