Fixes for all tasks