Fixes for empty elements