Fixes after Łukasz review.