Small fixes. Thanks to Julius Goryavsky