Minor feature adjustments