Some updates to figure tags