Some fixes in DAO-layer after checks