adjustments for newer build tools version