Fix Minor build issues