fixed a couple of minor compile issues when using incremental compiler