Bugs fixing!