Fixed Fix Commit

Fixed issues that resulted from the merge on last commit/sync