A lot of fixes.