Configuration fixes to avoid conflicts when accessing as mercury