Consistent handling of buttons
Fix a typo
Update the lock file