Small fixes I didn't see before. See change log.