Fix non-generator tasks