Fix some lingering DM references