build issues resolved