Minor support changes