Consistency and Context Fixes