Tweaks to the order classes run for metastore