Ignore spot instances. Several other misc fixes