Small further fixes on PBS