Fix for upstream quantum db changes