First round of fixes
Second round of fixes