Misc changes
PoC client