Corrected Trivial Bugs & Backward Competibility Issues.