Fixes on firmware build image