29.12 fixes
Merge pull request #78 from Dolgovec/patch-90

29.12 fixes