tweaks to support the latest docker builds