fixes wait_for_service and bonds storage