Fixed some bugs with task load