Various fixes after running in the wild for a week