fixed more build issues