Safer build