Observable client and small fixes