Add option for client type

Add option for the type of client being used.
Fix some build warnings.