Resolves build issues