Updates to get building from ami working.