Fixed some bugs in the new styles.