Some minor bug fixes and updates to match chef-metal master