Last updates and fixes from Andrey.