Yet more compile fixes