More fixes for using QD library.