Fix Source fix typo, add fix for  keyword.