Fix compile issues