Fixes

Fixed service endpoints in preparation for Windows Azure depoyment