- New lock state: Present
- Use new API
- Minor fixes
