Fixes #1068 Upgrade 1.6.14 to 1.8 Beta 3 errors

Fixes #1068