Fixed 2 Bugs.