Fixes few engine & scheduler
Commits v2 beta