Fix some global non-const statics