Update ivy configs
Fix bootstrap bugs