More bugs fixes.