Address some masking issues in chrome