Minor build issues