Assorted changes to get current.