More Fixes #1087