Fix compile issues for now