Fixes in Breeze-data-service