More improvements to ensure task