Couple of bugs fixed.