Fixes for Fabbot