Committing some updates done ages ago