Some build tweaks for bnes