Fixes for the other tasks calculations