Fix some compile issues with last merge.