Changes required by Bke/BTVPro