Fixes on dao’s and REST services