Small fixes from platform trial.