DAOs hopefully fixed for the most part