Fix few build issues