Fix db errors on saving bw and demand