Small fixes together with Oleg