Pre Merge Commit - Fixed minor issues