Fix for figaro on db instances