More dme fixes, what the heck...