29.12 fixes
Merge pull request #79 from Dolgovec/patch-91

29.12 fixes