* Couple of bug fixes from previous commit