fix fabbot issues