Init tweaks to start adding PCL support to SS.Client