some fixes to previous commit