Fixed some compile issues