Fix remaining parts