Fixed initialization problems