Minor changes to sync with Draem updates.