Fix PR review comments from @Tarrasch