Fixes to get it working at BTF