Minor fixes for SkimSrv.