Consistency and efficiency fixes