Misc. fixes for UserTasks