some relevant fixes
some relevant fixes