More corrected bugs