fixed some compile issues