Couple of minor Extras fixes