Couple more fixes so that tasks load