psot build fixes