furhter fixes for backport of base styles from 4.2