Tweak to work with beta builds