Another couple of updates for consistency