Couple more bugs fixed.