Bugs correcting