More Fixes #991