Adding another round of fixes