Some simple updates for consistency