Maintenance updates

/CC @micahflee