Fix of not initialized variables