More Fixes #1614