Fix Small Bugs