More fixes for no outer labels