Some small changes -> upstream