OSPL-3310 Buildfile tweaks.