Native buildfix