More bugs fixed.