Making some more adjustments to handle auto CSS properties.