some evernote porting fixes