Fixes for missing elements