Making a few optimization changes.