Fixes for DOB