More numberig fixes