Fixes for Elements