Fixes for markup containers and list views.