Couple of feature requests