Fixes to get taskqueue add working