Small tweaks to 'engi build cmpkg'