Fixes for client class