Down to three build errors based on deprecated interfaces..