Various fixes for emphasis