A few fixes discovered while packaging