Fix issues related to requireElements