Fixes
fix for LINQ ORM
Fix for Context