Fixes so that metadata will deploy