Fix scheduler and init actions