Moar DSON fixes