Improve focus handling
Update moment version (and fix stupid typo)