Fixing overrides and broken fragment references