ClientAPI Build Fixes