more compile fixes