Bugs fixing.