Adding patch to support other build targetS