Pushing some fixes related to styles with changes on 18/1.