Little fixes from the other branch