Added fixes for certain elements.