Fixed sprint9 issues