Fixed client build

Hopefully commited everything missing?