More spec support files and small improvements