Resolving various build issues