Fix mobile breakage after template merge