Fixed circular DB issues