Inconsistency bugs resolved