some relevant fixes