fixes from the previous commit