Fixes for classes with static constructors