Fixed minor compile issues