fixes for sprint 7