More bugs corrected