Misc client fixes