Apply fix for Dao implementations