chore(fixes): Adds fixes from Volodymyr.
0.0.5