Various small changes, not important.