Try fixes from metanota

Merge changes from metanota