More work on the core scheduler