fabbot fixes