Fit some bugs from Des