Fix errors (Oleksii Tsvietnov)