Minor changes to get code signing working (again)