updated code to fix some build issues