next batch of fixes.