Fixed Small Bugs