Changes wrt tickets on unfuddle