Updates for service changes and some bug fixes