Minor cleanup to chrome behavior