Fixing issues @ BTF