Fix code signing errors
Todo