Couple bugs fixed.