Little more compile fixes