Solve Minor Bugs