Couple of minor compile fixes