- Fix plan counting
- Fix database schema watch stopping sometimes
