Fixed static constructors