Fixed compile issues