sprint 8 fixes