Couple of fixes to make ds work again (kinda)