Minor updates to make sure things run locally and in the cluster