- Multiple bugs fix.