Small changes to new stuff.