Couple of improvements