fix some build issues
fix compile issues