Final round of fixes