fixed build but bwc questions remain