Second round of fixes