Small fixes from the previous commit