Minor code updates.