Fixed missing element errors