Some code fixes during Task Creation