Various Client Fixes

Various Client Fixes