Fixed static initialization problems