Fixes for typesetting