Fixes for conflicts with Sitevision