Fixed global constructors for real this time...