Fix support for running in clent (SSP)