Fixes in Elem API