some fixes on the previous commit