small fixes of modern design