[sprint 6] fixes