Typesetting Fixes