Yet another round of fixes