Few fixes from Tony.