Fixes for supply/demand estimation