Some fixes in DAO.stg. refs #500