Improve install metadata handling