Fixes and sheduler setup