Minor logical changes.