Rally specific tweaks