Fix fabbot issues