Fix issues with 'Me' related to previous commit